* Re: [PATCH v2] mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
From: Matthew L. Creech @ 2011-07-05 23:14 UTC (permalink / raw)
To: Scott Wood; +Cc: linux-mtd, linuxppc-dev, mhench, rick22
In-Reply-To: <20110705180138.469f34d1@schlenkerla.am.freescale.net>
On Tue, Jul 5, 2011 at 7:01 PM, Scott Wood <scottwood@freescale.com> wrote:
>
> Just noticed, full_page can come out as well.
>
> Otherwise, ACK
>
Oh right, didn't notice that - thanks.
--
Matthew L. Creech
^ permalink raw reply
* [PATCH v3] mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
From: Matthew L. Creech @ 2011-07-05 23:14 UTC (permalink / raw)
To: linux-mtd; +Cc: scottwood, linuxppc-dev, rick22, mhench
In-Reply-To: <1309905302-1990-1-git-send-email-mlcreech@gmail.com>
From: Mike Hench <mhench@elutions.com>
The eLBC NAND driver currently follows up each program/write operation with a
read-back of the page, in order to [ostensibly] fill in ECC data for the
caller. However, the page address used for this read is always -1, so the read
will never work correctly. Remove this useless (and potentially problematic)
block of code.
v2: elbc_fcm_ctrl->oob_poi is removed entirely, since this code block was the
only place it was actually used.
v3: local 'full_page' variable is no longer used either.
Signed-off-by: Matthew L. Creech <mlcreech@gmail.com>
---
drivers/mtd/nand/fsl_elbc_nand.c | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 0bb254c..b4d310f 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -75,7 +75,6 @@ struct fsl_elbc_fcm_ctrl {
unsigned int use_mdr; /* Non zero if the MDR is to be set */
unsigned int oob; /* Non zero if operating on OOB data */
unsigned int counter; /* counter for the initializations */
- char *oob_poi; /* Place to write ECC after read back */
};
/* These map to the positions used by the FCM hardware ECC generator */
@@ -435,7 +434,6 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
/* PAGEPROG reuses all of the setup from SEQIN and adds the length */
case NAND_CMD_PAGEPROG: {
- int full_page;
dev_vdbg(priv->dev,
"fsl_elbc_cmdfunc: NAND_CMD_PAGEPROG "
"writing %d bytes.\n", elbc_fcm_ctrl->index);
@@ -445,34 +443,12 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
* write so the HW generates the ECC.
*/
if (elbc_fcm_ctrl->oob || elbc_fcm_ctrl->column != 0 ||
- elbc_fcm_ctrl->index != mtd->writesize + mtd->oobsize) {
+ elbc_fcm_ctrl->index != mtd->writesize + mtd->oobsize)
out_be32(&lbc->fbcr, elbc_fcm_ctrl->index);
- full_page = 0;
- } else {
+ else
out_be32(&lbc->fbcr, 0);
- full_page = 1;
- }
fsl_elbc_run_command(mtd);
-
- /* Read back the page in order to fill in the ECC for the
- * caller. Is this really needed?
- */
- if (full_page && elbc_fcm_ctrl->oob_poi) {
- out_be32(&lbc->fbcr, 3);
- set_addr(mtd, 6, page_addr, 1);
-
- elbc_fcm_ctrl->read_bytes = mtd->writesize + 9;
-
- fsl_elbc_do_read(chip, 1);
- fsl_elbc_run_command(mtd);
-
- memcpy_fromio(elbc_fcm_ctrl->oob_poi + 6,
- &elbc_fcm_ctrl->addr[elbc_fcm_ctrl->index], 3);
- elbc_fcm_ctrl->index += 3;
- }
-
- elbc_fcm_ctrl->oob_poi = NULL;
return;
}
@@ -752,13 +728,8 @@ static void fsl_elbc_write_page(struct mtd_info *mtd,
struct nand_chip *chip,
const uint8_t *buf)
{
- struct fsl_elbc_mtd *priv = chip->priv;
- struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand;
-
fsl_elbc_write_buf(mtd, buf, mtd->writesize);
fsl_elbc_write_buf(mtd, chip->oob_poi, mtd->oobsize);
-
- elbc_fcm_ctrl->oob_poi = chip->oob_poi;
}
static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
--
1.6.3.3
^ permalink raw reply related
* Re: pci_pcie_cap invalid on AER/EEH enabled PPC?
From: Richard A Lary @ 2011-07-06 0:14 UTC (permalink / raw)
To: Jon Mason
Cc: James Smart, linux-pci, Anton Blanchard, Richard Lary,
linuxppc-dev, davem
In-Reply-To: <4E137558.7030204@linux.vnet.ibm.com>
On 7/5/2011 1:34 PM, Richard A Lary wrote:
> On 7/5/2011 10:22 AM, Richard A Lary wrote:
>> On 7/5/2011 9:18 AM, Jon Mason wrote:
>>> On Tue, Jul 5, 2011 at 10:41 AM, Richard A Lary
>>> <rlary@linux.vnet.ibm.com> wrote:
>>>> On 7/1/2011 1:00 PM, Richard A Lary wrote:
>>>>>
>>>>> On 7/1/2011 12:02 PM, Jon Mason wrote:
>>>>>>
>>>>>> On Fri, Jul 1, 2011 at 1:30 PM, Richard A Lary<rlary@linux.vnet.ibm.com>
>>>>>> wrote:
>>>>>>>
>>>>>>> On 7/1/2011 8:24 AM, Jon Mason wrote:
>>>>>>>>
>>>>>>>> I recently sent out a number of patches to migrate drivers calling
>>>>>>>> `pci_find_capability(pdef, PCI_CAP_ID_EXP)` to pci_pcie_cap. This
>>>>>>>> function takes uses a PCI-E capability offset that was determined by
>>>>>>>> calling pci_find_capability during the PCI bus walking. In response
>>>>>>>> to one of the patches, James Smart posted:
>>>>>>>>
>>>>>>>> "The reason is due to an issue on PPC platforms whereby use of
>>>>>>>> "pdev->is_pcie" and pci_is_pcie() will erroneously fail under some
>>>>>>>> conditions, but explicit search for the capability struct via
>>>>>>>> pci_find_capability() is always successful. I expect this to be due
>>>>>>>> a shadowing of pci config space in the hal/platform that isn't
>>>>>>>> sufficiently built up. We detected this issue while testing AER/EEH,
>>>>>>>> and are functional only if the pci_find_capability() option is used."
>>>>>>>>
>>>>>>>> See http://marc.info/?l=linux-scsi&m=130946649427828&w=2 for the whole
>>>>>>>> post.
>>>>>>>>
>>>>>>>> Based on his description above pci_pcie_cap
>>>>>>>> andpci_find_capability(pdef, PCI_CAP_ID_EXP) should be functionally
>>>>>>>> equivalent. If this is not safe, then the PCI bus walking code is
>>>>>>>> most likely busted on EEH enabled PPC systems (and that is a BIG
>>>>>>>> problem). Can anyone confirm this is still an issue?
>>>>>>>
>>>>>>> Jon,
>>>>>>>
>>>>>>> I applied the following debug patch to lpfc driver in a 2.6.32 distro
>>>>>>> kernel ( I had this one handy, I can try with mainline later today )
>>>>>>>
>>>>>>> ---
>>>>>>> drivers/scsi/lpfc/lpfc_init.c | 10 10 + 0 - 0 !
>>>>>>> 1 file changed, 10 insertions(+)
>>>>>>>
>>>>>>> Index: b/drivers/scsi/lpfc/lpfc_init.c
>>>>>>> ===================================================================
>>>>>>> --- a/drivers/scsi/lpfc/lpfc_init.c
>>>>>>> +++ b/drivers/scsi/lpfc/lpfc_init.c
>>>>>>> @@ -3958,6 +3958,16 @@ lpfc_enable_pci_dev(struct lpfc_hba *phb
>>>>>>> pci_try_set_mwi(pdev);
>>>>>>> pci_save_state(pdev);
>>>>>>>
>>>>>>> + printk(KERN_WARNING "pcicap: is_pcie=%x pci_cap=%x pcie_type=%x\n",
>>>>>>> + pdev->is_pcie,
>>>>>>> + pdev->pcie_cap,
>>>>>>> + pdev->pcie_type);
>>>>>>> +
>>>>>>> + if (pci_is_pcie(pdev))
>>>>>>> + printk(KERN_WARNING "pcicap: true\n");
>>>>>>> + else
>>>>>>> + printk(KERN_WARNING "pcicap: false\n");
>>>>>>> +
>>>>>>> /* PCIe EEH recovery on powerpc platforms needs fundamental reset */
>>>>>>> if (pci_find_capability(pdev, PCI_CAP_ID_EXP))
>>>>>>> pdev->needs_freset = 1;
>>>>>>>
>>>>>>> This is output upon driver load on an IBM Power 7 model 8233-E8B server.
>>>>>>>
>>>>>>> dmesg | grep pcicap
>>>>>>> Linux version 2.6.32.42-pcicap-ppc64 (geeko@buildhost) (gcc version
>>>>>>> 4.3.4
>>>>>>> [gcc-4_3-branch revision 152973] (SUSE Linux) ) #1 SMP Fri Jul 1
>>>>>>> 09:31:27
>>>>>>> PDT 2011
>>>>>>> pcicap: is_pcie=0 pci_cap=0 pcie_type=0
>>>>>>> pcicap: false
>>>>>>> pcicap: is_pcie=0 pci_cap=0 pcie_type=0
>>>>>>> pcicap: false
>>>>>>> pcicap: is_pcie=0 pci_cap=0 pcie_type=0
>>>>>>> pcicap: false
>>>>>>> pcicap: is_pcie=0 pci_cap=0 pcie_type=0
>>>>>>> pcicap: false
>>>>>>>
>>>>>>> It would appear that the pcie information is not set in pci_dev
>>>>>>> structure
>>>>>>> for
>>>>>>> this device at the time the driver is being initialized during boot.
>>>>>>
>>>>>> Thanks for trying this. Can you confirm that the other devices in the
>>>>>> system have this issue as well (or show that it is isolated to the lpr
>>>>>> device)? You can add printks in set_pcie_port_type() to verify what
>>>>>> is being set on bus walking and to see when it is being called with
>>>>>> respect to when it is being populated by firmware.
>>>>>
>>>>> Jon,
>>>>>
>>>>> I will give this suggestion a try and post results
>>>>
>>>> On Power PC platforms, set_pcie_port_type() is not called. On Power PC,
>>>> pci_dev structure is initialized by of_create_pci_dev(). However, the
>>>> structure member pcie_cap is NOT computed nor set in this function.
>>>
>>> Yes, it is. of_create_pci_dev() calls set_pcie_port_type()
>>> http://lxr.linux.no/linux+v2.6.39/arch/powerpc/kernel/pci_of_scan.c#L144
>>>
>>> That function sets pdev->pcie_cap
>>> http://lxr.linux.no/linux+v2.6.39/drivers/pci/probe.c#L896
>>>
>>> So, it should be set. It looks like there is a bug in
>>> of_create_pci_dev, as set_pcie_port_type is being called BEFORE the
>>> BARs are setup. If you move set_pcie_port_type prior to
>>> pci_device_add (perhaps even after), then I bet the issue is resolved.
>>>
>>
>> The claim above was based upon observation that with this patch applied
>> to a 2.6.32 kernel, the printk output did not appear in dmesg upon boot.
>>
>> static void set_pcie_hotplug_bridge(struct pci_dev *pdev)
>> @@ -774,6 +780,8 @@ int pci_setup_device(struct pci_dev *dev
>> u8 hdr_type;
>> struct pci_slot *slot;
>>
>> + printk(KERN_WARNING "pcicap: setup_device %p\n", dev);
>> +
>> if (pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type))
>> return -EIO;
>>
>> I can make no claim about my understanding of pci device initialization
>> on Power PC, so I have added Anton Blanchard to the cc list.
>>
>> Perhaps Anton can explain why pcie_cap is always 0 on Power PC.
>
> I pulled down 3.0-rc6 kernel, I will build and test the pci_is_pcie(pdev)
> patch in lpfc driver now that set_pcie_port_type() is called from
> of_create_pci_dev().
Jon,
I applied the debug patches mentioned above along with the lpfc patch
http://marc.info/?l=linux-scsi&m=130919648513685&w=2
to linux 3.0-rc6 kernel.
The debug patches show that pci_dev members "is_pcie, pci_cap and pcie_type" are
now all being set to correct values now that 'of_create_pci_dev()' calls
'set_pcie_port_type()'. I was not able to determine when this patch went in.
My tests show that lpfc driver now recovers from injected PCIe bus errors
using test the 'if (pci_is_pcie(pdev))' for PCIe adapter type.
I did not apply the test patch which changed the location of
set_pcie_port_type(dev) in of_create_pci_dev(). I can apply and test
this change if you think it is necessary?
Based upon these results, I will ACK the change to the lpfc driver for
"[PATCH 03/19] lpfc: remove unnecessary read of PCI_CAP_ID_EXP".
I suspect that other drivers which are modified to use 'if (pci_is_pcie(pdev))'
will work on Power PC as well, but I did not test any drivers other than lpfc.
-rich
^ permalink raw reply
* Re: pci_pcie_cap invalid on AER/EEH enabled PPC?
From: Benjamin Herrenschmidt @ 2011-07-06 2:42 UTC (permalink / raw)
To: Richard A Lary
Cc: James Smart, linux-pci, Richard Lary, Jon Mason, linuxppc-dev,
davem
In-Reply-To: <4E1330A3.8080004@linux.vnet.ibm.com>
> On Power PC platforms, set_pcie_port_type() is not called. On Power PC,
> pci_dev structure is initialized by of_create_pci_dev(). However, the
> structure member pcie_cap is NOT computed nor set in this function.
Just a quick correction here, please don't say "On Power PC platforms"
such generic statements that only apply to IBM pSeries platforms running
under pHyp :-)
There's plenty of other platforms supported in arch/powerpc that have
very different characteristics and use more "generic" code to build
their PCI layout.
> The information used to populate pci_dev comes from the Power PC
> device_tree passed to the OS by Open Firmware.
>
> Based upon standing Power PC design, we cannot support patches
> which replace pci_find_capability(pdef, PCI_CAP_ID_EXP) with
> pci_is_pcie(pdev) on Power PC platforms.
No, that isn't correct. We can (and should) fix our arch code to do the
right thing. There is no reason why those two wouldn't be equivalent.
If we are missing a call to set_pcie_port_type() then we should add it,
however if I look at our upstream code, pci_of_scan.c seems to be
calling that, so it could be a missing backport ?
Can you try with an upstream kernel ?
Cheers,
Ben.
^ permalink raw reply
* Re: pci_pcie_cap invalid on AER/EEH enabled PPC?
From: Benjamin Herrenschmidt @ 2011-07-06 2:47 UTC (permalink / raw)
To: Richard A Lary
Cc: James Smart, linux-pci, Anton Blanchard, Richard Lary, Jon Mason,
linuxppc-dev, davem
In-Reply-To: <4E13A8F0.80700@linux.vnet.ibm.com>
On Tue, 2011-07-05 at 17:14 -0700, Richard A Lary wrote:
> I applied the debug patches mentioned above along with the lpfc patch
> http://marc.info/?l=linux-scsi&m=130919648513685&w=2
> to linux 3.0-rc6 kernel.
>
> The debug patches show that pci_dev members "is_pcie, pci_cap and pcie_type" are
> now all being set to correct values now that 'of_create_pci_dev()' calls
> 'set_pcie_port_type()'. I was not able to determine when this patch went in.
git is good for that :-)
bb209c8287d2d55ec4a67e3933346e0a3ee0da76:
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org> 2010-01-27 04:10:03
Committer: Benjamin Herrenschmidt <benh@kernel.crashing.org> 2010-01-29 16:51:10
Parent: 4406c56d0a4da7a37b9180abeaece6cd00bcc874 (Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6)
Child: 26b4a0ca46985ae9586c194f7859f3838b1230f8 (powerpc/pci: Add missing hookup to pci_slot)
Branches: many (38)
Follows: v2.6.33-rc5
Precedes: v2.6.33-rc7
powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
We are missing these when building the pci_dev from scratch off
the Open Firmware device-tree
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
We should probably backport it to .32-stable. Any volunteer ?
You might also want to consider for backport:
26b4a0ca46985ae9586c194f7859f3838b1230f8 and
94afc008e1e6fbadfac0b75fcf193b6d7074b2f1
> My tests show that lpfc driver now recovers from injected PCIe bus errors
> using test the 'if (pci_is_pcie(pdev))' for PCIe adapter type.
>
> I did not apply the test patch which changed the location of
> set_pcie_port_type(dev) in of_create_pci_dev(). I can apply and test
> this change if you think it is necessary?
No I think we call it in the right place, which mirrors
pci_setup_device(), that is before the early quirk.
> Based upon these results, I will ACK the change to the lpfc driver for
> "[PATCH 03/19] lpfc: remove unnecessary read of PCI_CAP_ID_EXP".
> I suspect that other drivers which are modified to use 'if (pci_is_pcie(pdev))'
> will work on Power PC as well, but I did not test any drivers other than lpfc.
Cheers,
Ben.
^ permalink raw reply
* [PATCH] sm501: When registering the GPIO, turn on the GPIO unit's power
From: Josh Triplett @ 2011-07-06 3:41 UTC (permalink / raw)
To: Samuel Ortiz, Paul Mundt, Ben Dooks
Cc: psas-avionics, linuxppc-dev, linux-kernel
When attempting to use GPIO via the sm501 unit on the TQM5200 board,
GPIO operations would only function if during the same boot u-boot's
"fkt led" command had initialized the sm501. Comparing the sm501's
registers with and without running the "fkt led" command turned up one
significant difference: u-boot had enabled the GPIO power gate.
Changing the Linux sm501 driver to enable the GPIO power gate allows
GPIO to work without first initializing it with u-boot.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
---
drivers/mfd/sm501.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index df3702c..d7a0ab9 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1089,6 +1089,7 @@ static int __devinit sm501_register_gpio(struct sm501_devdata *sm)
goto err_low_chip;
}
+ sm501_unit_power(sm->dev, SM501_GATE_GPIO, 1);
gpio->registered = 1;
return 0;
@@ -1118,6 +1119,8 @@ static void sm501_gpio_remove(struct sm501_devdata *sm)
if (!sm->gpio.registered)
return;
+ sm501_unit_power(sm->dev, SM501_GATE_GPIO, 0);
+
ret = gpiochip_remove(&gpio->low.gpio);
if (ret)
dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH 1/2] mtd/nand : don't free the global data fsl_lbc_ctrl_dev->nand in fsl_elbc_chip_remove()
From: Artem Bityutskiy @ 2011-07-06 6:46 UTC (permalink / raw)
To: b35362; +Cc: linuxppc-dev, dwmw2, linux-mtd
In-Reply-To: <1309225852-1664-1-git-send-email-b35362@freescale.com>
On Tue, 2011-06-28 at 09:50 +0800, b35362@freescale.com wrote:
> From: Liu Shuo <b35362@freescale.com>
>
> The global data fsl_lbc_ctrl_dev->nand don't have to be freed in
> fsl_elbc_chip_remove(). The right place to do that is in fsl_elbc_nand_remove()
> if elbc_fcm_ctrl->counter is zero.
>
> Signed-off-by: Liu Shuo <b35362@freescale.com>
Changed the subject to something shorted and pushed to l2-mtd-2.6.git,
thanks.
--
Best Regards,
Artem Bityutskiy
^ permalink raw reply
* Re: [PATCH v3] mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
From: Artem Bityutskiy @ 2011-07-06 7:23 UTC (permalink / raw)
To: Matthew L. Creech; +Cc: scottwood, linuxppc-dev, linux-mtd, mhench, rick22
In-Reply-To: <1309907688-8235-1-git-send-email-mlcreech@gmail.com>
On Tue, 2011-07-05 at 19:14 -0400, Matthew L. Creech wrote:
> From: Mike Hench <mhench@elutions.com>
>
> The eLBC NAND driver currently follows up each program/write operation with a
> read-back of the page, in order to [ostensibly] fill in ECC data for the
> caller. However, the page address used for this read is always -1, so the read
> will never work correctly. Remove this useless (and potentially problematic)
> block of code.
Pushed to l2-mtd-2.6.git, thanks!
--
Best Regards,
Artem Bityutskiy
^ permalink raw reply
* Re: [RFC] [PATCH] hvc_console: improve tty/console put_chars handling
From: Anton Blanchard @ 2011-07-06 7:49 UTC (permalink / raw)
To: Hendrik Brueckner
Cc: Tabi Timur-B04825, linuxppc-dev@lists.ozlabs.org,
borntraeger@de.ibm.com
In-Reply-To: <20110705142844.GA2514@linux.vnet.ibm.com>
Hi Hendrik,
> So with the patch below, the backend can now indirectly control the
> way console output is handled for it. I still have to think if this
> solution is ok or if it is better to introduce a new callback to
> console output only (and might provide a default implemenatation
> similar to the patch below).
>
> NOTE: I did not yet test this patch but will do.. I just want to
> share it early to get feedback from you.
Thanks a lot for this. I added the pseries bits and tested it, patches
to follow.
Anton
^ permalink raw reply
* [PATCH 1/2]: hvc_console: improve tty/console put_chars handling
From: Anton Blanchard @ 2011-07-06 7:50 UTC (permalink / raw)
To: Hendrik Brueckner
Cc: Tabi Timur-B04825, linuxppc-dev@lists.ozlabs.org,
borntraeger@de.ibm.com
In-Reply-To: <20110705142844.GA2514@linux.vnet.ibm.com>
From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Currently, the hvc_console_print() function drops console output if the
hvc backend's put_chars() returns 0. This patch changes this behavior
to allow a retry through returning -EAGAIN.
This change also affects the hvc_push() function. Both functions are
changed to handle -EAGAIN and to retry the put_chars() operation.
If a hvc backend returns -EAGAIN, the retry handling differs:
- hvc_console_print() spins to write the complete console output.
- hvc_push() behaves the same way as for returning 0.
Now hvc backends can indirectly control the way how console output is
handled through the hvc console layer.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
---
Index: linux-powerpc/drivers/tty/hvc/hvc_console.c
===================================================================
--- linux-powerpc.orig/drivers/tty/hvc/hvc_console.c 2011-07-06 17:10:51.288360541 +1000
+++ linux-powerpc/drivers/tty/hvc/hvc_console.c 2011-07-06 17:11:16.398794913 +1000
@@ -163,8 +163,10 @@ static void hvc_console_print(struct con
} else {
r = cons_ops[index]->put_chars(vtermnos[index], c, i);
if (r <= 0) {
- /* throw away chars on error */
- i = 0;
+ /* throw away characters on error
+ * but spin in case of -EAGAIN */
+ if (r != -EAGAIN)
+ i = 0;
} else if (r > 0) {
i -= r;
if (i > 0)
@@ -448,7 +450,7 @@ static int hvc_push(struct hvc_struct *h
n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
if (n <= 0) {
- if (n == 0) {
+ if (n == 0 || n == -EAGAIN) {
hp->do_wakeup = 1;
return 0;
}
^ permalink raw reply
* [PATCH 2/2]: powerpc/pseries/hvconsole: Fix dropped console output
From: Anton Blanchard @ 2011-07-06 7:51 UTC (permalink / raw)
To: Hendrik Brueckner
Cc: Tabi Timur-B04825, linuxppc-dev@lists.ozlabs.org,
borntraeger@de.ibm.com
In-Reply-To: <20110705142844.GA2514@linux.vnet.ibm.com>
Return -EAGAIN when we get H_BUSY back from the hypervisor. This
makes the hvc console driver retry, avoiding dropped printks.
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
---
Index: linux-powerpc/arch/powerpc/platforms/pseries/hvconsole.c
===================================================================
--- linux-powerpc.orig/arch/powerpc/platforms/pseries/hvconsole.c 2011-07-06 17:11:33.799095935 +1000
+++ linux-powerpc/arch/powerpc/platforms/pseries/hvconsole.c 2011-07-06 17:11:47.499332962 +1000
@@ -73,7 +73,7 @@ int hvc_put_chars(uint32_t vtermno, cons
if (ret == H_SUCCESS)
return count;
if (ret == H_BUSY)
- return 0;
+ return -EAGAIN;
return -EIO;
}
^ permalink raw reply
* Re: [PATCH] powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
From: Anton Blanchard @ 2011-07-06 7:55 UTC (permalink / raw)
To: Michael Neuling; +Cc: linuxppc-dev
In-Reply-To: <29259.1309848010@neuling.org>
On Tue, 05 Jul 2011 16:40:10 +1000
Michael Neuling <mikey@neuling.org> wrote:
> The existing code it pretty ugly. How about we clean it up even more
> like this?
Looks good and it passed my kdump test cases.
Anton
> From: Anton Blanchard <anton@samba.org>
>
> We check for timeout expiry in the outer loop, but we also need to
> check it in the inner loop or we can lock up forever waiting for a
> CPU to hit real mode.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> Cc: <stable@kernel.org>
>
> diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
> index 4e6ee94..cc6a9d5 100644
> --- a/arch/powerpc/kernel/crash.c
> +++ b/arch/powerpc/kernel/crash.c
> @@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(int cpu)
>
> while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
> barrier();
> - if (!cpu_possible(i)) {
> + if (!cpu_possible(i) || !cpu_online(i) ||
> (msecs <= 0)) break;
> - }
> - if (!cpu_online(i)) {
> - break;
> - }
> msecs--;
> mdelay(1);
> }
>
^ permalink raw reply
* Re: [PATCH 1/2] powerpc/5200: mpc5200b.dtsi: add spi node address- and size-cells properties
From: Anatolij Gustschin @ 2011-07-06 9:43 UTC (permalink / raw)
To: Grant Likely; +Cc: devicetree-discuss, linuxppc-dev
In-Reply-To: <1305561764-5942-1-git-send-email-agust@denx.de>
Hi Grant,
can you please pick these patches for 3.1 ?
On Mon, 16 May 2011 18:02:43 +0200
Anatolij Gustschin <agust@denx.de> wrote:
> Both, #address-cells and #size-cells properties are required
> for spi bus node, so add them.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> arch/powerpc/boot/dts/mpc5200b.dtsi | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc5200b.dtsi b/arch/powerpc/boot/dts/mpc5200b.dtsi
> index bc27548..7ab286a 100644
> --- a/arch/powerpc/boot/dts/mpc5200b.dtsi
> +++ b/arch/powerpc/boot/dts/mpc5200b.dtsi
> @@ -147,6 +147,8 @@
> };
>
> spi@f00 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
> reg = <0xf00 0x20>;
> interrupts = <2 13 0 2 14 0>;
Thanks,
Anatolij
^ permalink raw reply
* Re: [PATCH] powerpc/5200: dts: digsy_mtc.dts: add timer0 and timer1 gpio properties
From: Anatolij Gustschin @ 2011-07-06 9:46 UTC (permalink / raw)
To: grant.likely; +Cc: linuxppc-dev
In-Reply-To: <1307399225-15882-1-git-send-email-agust@denx.de>
Hi Grant,
Can you please pick this patch for 3.1 ?
On Tue, 7 Jun 2011 00:27:05 +0200
Anatolij Gustschin <agust@denx.de> wrote:
> timer0 and timer1 pins are used as simple GPIO on this board.
> Add gpio-controller and #gpio-cells properties to timer nodes
> so that we can control gpio lines using available MPC52xx
> GPT driver.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> arch/powerpc/boot/dts/digsy_mtc.dts | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts
> index e205d17..2aad7ae 100644
> --- a/arch/powerpc/boot/dts/digsy_mtc.dts
> +++ b/arch/powerpc/boot/dts/digsy_mtc.dts
> @@ -23,7 +23,14 @@
>
> soc5200@f0000000 {
> timer@600 { // General Purpose Timer
> + #gpio-cells = <2>;
> fsl,has-wdt;
> + gpio-controller;
> + };
> +
> + timer@610 {
> + #gpio-cells = <2>;
> + gpio-controller;
> };
>
> rtc@800 {
Thanks,
Anatolij
^ permalink raw reply
* Re: [PATCH] powerpc/5200: add GPIO functions for simple interrupt GPIOs
From: Anatolij Gustschin @ 2011-07-06 9:51 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
In-Reply-To: <1306142730-7528-1-git-send-email-agust@denx.de>
Hi Grant,
Ping.
On Mon, 23 May 2011 11:25:30 +0200
Anatolij Gustschin <agust@denx.de> wrote:
> The mpc52xx_gpio driver currently supports 8 wakeup GPIOs and 32
> simple GPIOs. Extend it to also support GPIO function of 8 simple
> interrupt GPIOs controlled in the standard GPIO register module.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 117 ++++++++++++++++++++++++++++
> 1 files changed, 117 insertions(+), 0 deletions(-)
...
Thanks,
Anatolij
^ permalink raw reply
* Re: [PATCH] powerpc/5200: dts: digsy_mtc.dts: add timer0 and timer1 gpio properties
From: Grant Likely @ 2011-07-06 17:16 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linuxppc-dev
In-Reply-To: <20110706114627.56388c2e@wker>
On Wed, Jul 06, 2011 at 11:46:27AM +0200, Anatolij Gustschin wrote:
> Hi Grant,
>
> Can you please pick this patch for 3.1 ?
>
> On Tue, 7 Jun 2011 00:27:05 +0200
> Anatolij Gustschin <agust@denx.de> wrote:
>
> > timer0 and timer1 pins are used as simple GPIO on this board.
> > Add gpio-controller and #gpio-cells properties to timer nodes
> > so that we can control gpio lines using available MPC52xx
> > GPT driver.
> >
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
Merged, thanks.
g.
> > ---
> > arch/powerpc/boot/dts/digsy_mtc.dts | 7 +++++++
> > 1 files changed, 7 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts
> > index e205d17..2aad7ae 100644
> > --- a/arch/powerpc/boot/dts/digsy_mtc.dts
> > +++ b/arch/powerpc/boot/dts/digsy_mtc.dts
> > @@ -23,7 +23,14 @@
> >
> > soc5200@f0000000 {
> > timer@600 { // General Purpose Timer
> > + #gpio-cells = <2>;
> > fsl,has-wdt;
> > + gpio-controller;
> > + };
> > +
> > + timer@610 {
> > + #gpio-cells = <2>;
> > + gpio-controller;
> > };
> >
> > rtc@800 {
>
>
> Thanks,
> Anatolij
^ permalink raw reply
* Re: [PATCH 1/2] powerpc/5200: mpc5200b.dtsi: add spi node address- and size-cells properties
From: Grant Likely @ 2011-07-06 17:27 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: devicetree-discuss, linuxppc-dev
In-Reply-To: <20110706114319.17af93a3@wker>
On Wed, Jul 06, 2011 at 11:43:19AM +0200, Anatolij Gustschin wrote:
> Hi Grant,
>
> can you please pick these patches for 3.1 ?
>
> On Mon, 16 May 2011 18:02:43 +0200
> Anatolij Gustschin <agust@denx.de> wrote:
>
> > Both, #address-cells and #size-cells properties are required
> > for spi bus node, so add them.
> >
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
Merged, thanks.
g.
> > ---
> > arch/powerpc/boot/dts/mpc5200b.dtsi | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/powerpc/boot/dts/mpc5200b.dtsi b/arch/powerpc/boot/dts/mpc5200b.dtsi
> > index bc27548..7ab286a 100644
> > --- a/arch/powerpc/boot/dts/mpc5200b.dtsi
> > +++ b/arch/powerpc/boot/dts/mpc5200b.dtsi
> > @@ -147,6 +147,8 @@
> > };
> >
> > spi@f00 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
> > reg = <0xf00 0x20>;
> > interrupts = <2 13 0 2 14 0>;
>
> Thanks,
> Anatolij
^ permalink raw reply
* Re: [PATCH] powerpc/5200: add GPIO functions for simple interrupt GPIOs
From: Grant Likely @ 2011-07-06 17:52 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linuxppc-dev
In-Reply-To: <1306142730-7528-1-git-send-email-agust@denx.de>
On Mon, May 23, 2011 at 11:25:30AM +0200, Anatolij Gustschin wrote:
> The mpc52xx_gpio driver currently supports 8 wakeup GPIOs and 32
> simple GPIOs. Extend it to also support GPIO function of 8 simple
> interrupt GPIOs controlled in the standard GPIO register module.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 117 ++++++++++++++++++++++++++++
I don't want to merge more open coded MMIO gpio driver code. This whole driver really needs to be converted to use GENERIC_GPIO.
g.
> 1 files changed, 117 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
> index 1757d1d..42a0759 100644
> --- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
> +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
> @@ -35,6 +35,9 @@ struct mpc52xx_gpiochip {
> unsigned int shadow_dvo;
> unsigned int shadow_gpioe;
> unsigned int shadow_ddr;
> + unsigned char sint_shadow_dvo;
> + unsigned char sint_shadow_gpioe;
> + unsigned char sint_shadow_ddr;
> };
>
> /*
> @@ -309,6 +312,100 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
> return 0;
> }
>
> +static int mpc52xx_sint_gpio_get(struct gpio_chip *gc, unsigned int gpio)
> +{
> + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
> + struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
> + unsigned int ret;
> +
> + ret = (in_8(®s->sint_ival) >> (7 - gpio)) & 1;
> +
> + pr_debug("%s: gpio: %d ret: %d\n", __func__, gpio, ret);
> +
> + return ret;
> +}
> +
> +static inline void
> +__mpc52xx_sint_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
> +{
> + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
> + struct mpc52xx_gpiochip *chip = container_of(mm_gc,
> + struct mpc52xx_gpiochip, mmchip);
> + struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
> +
> + if (val)
> + chip->sint_shadow_dvo |= 1 << (7 - gpio);
> + else
> + chip->sint_shadow_dvo &= ~(1 << (7 - gpio));
> +
> + out_8(®s->sint_dvo, chip->sint_shadow_dvo);
> +}
> +
> +static void
> +mpc52xx_sint_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
> +{
> + unsigned long flags;
> +
> + spin_lock_irqsave(&gpio_lock, flags);
> +
> + __mpc52xx_sint_gpio_set(gc, gpio, val);
> +
> + spin_unlock_irqrestore(&gpio_lock, flags);
> +
> + pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
> +}
> +
> +static int mpc52xx_sint_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
> +{
> + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
> + struct mpc52xx_gpiochip *chip = container_of(mm_gc,
> + struct mpc52xx_gpiochip, mmchip);
> + struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&gpio_lock, flags);
> +
> + /* set the direction */
> + chip->sint_shadow_ddr &= ~(1 << (7 - gpio));
> + out_8(®s->sint_ddr, chip->sint_shadow_ddr);
> +
> + /* and enable the pin */
> + chip->sint_shadow_gpioe |= 1 << (7 - gpio);
> + out_8(®s->sint_gpioe, chip->sint_shadow_gpioe);
> +
> + spin_unlock_irqrestore(&gpio_lock, flags);
> +
> + return 0;
> +}
> +
> +static int
> +mpc52xx_sint_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
> +{
> + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
> + struct mpc52xx_gpio __iomem *regs = mm_gc->regs;
> + struct mpc52xx_gpiochip *chip = container_of(mm_gc,
> + struct mpc52xx_gpiochip, mmchip);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&gpio_lock, flags);
> +
> + __mpc52xx_sint_gpio_set(gc, gpio, val);
> +
> + /* Then set direction */
> + chip->sint_shadow_ddr |= 1 << (7 - gpio);
> + out_8(®s->sint_ddr, chip->sint_shadow_ddr);
> +
> + /* Finally enable the pin */
> + chip->sint_shadow_gpioe |= 1 << (7 - gpio);
> + out_8(®s->sint_gpioe, chip->sint_shadow_gpioe);
> +
> + spin_unlock_irqrestore(&gpio_lock, flags);
> +
> + pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
> +
> + return 0;
> +}
> +
> static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
> {
> struct mpc52xx_gpiochip *chip;
> @@ -337,6 +434,26 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev
> chip->shadow_ddr = in_be32(®s->simple_ddr);
> chip->shadow_dvo = in_be32(®s->simple_dvo);
>
> + chip = kzalloc(sizeof(*chip), GFP_KERNEL);
> + if (!chip)
> + return -ENOMEM;
> +
> + gc = &chip->mmchip.gc;
> +
> + gc->ngpio = 8;
> + gc->direction_input = mpc52xx_sint_gpio_dir_in;
> + gc->direction_output = mpc52xx_sint_gpio_dir_out;
> + gc->get = mpc52xx_sint_gpio_get;
> + gc->set = mpc52xx_sint_gpio_set;
> +
> + ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
> + if (ret)
> + return ret;
> +
> + regs = chip->mmchip.regs;
> + chip->sint_shadow_gpioe = in_8(®s->sint_gpioe);
> + chip->sint_shadow_ddr = in_8(®s->sint_ddr);
> + chip->sint_shadow_dvo = in_8(®s->sint_dvo);
> return 0;
> }
>
> --
> 1.7.1
>
^ permalink raw reply
* [PATCH] gpio: Move mpc5200 gpio driver to drivers/gpio
From: Grant Likely @ 2011-07-06 18:01 UTC (permalink / raw)
To: linuxppc-dev, linux-kernel
GPIO drivers are getting consolidated into drivers/gpio. While at it,
change the driver name to mpc5200-gpio* to avoid collisions.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
Ben, I'm going to take this via the gpio/next branch to avoid
conflicts with the big gpio rename.
g.
arch/powerpc/platforms/52xx/Kconfig | 8 --------
arch/powerpc/platforms/52xx/Makefile | 1 -
drivers/gpio/Kconfig | 4 ++++
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-mpc5200.c | 12 ++++--------
5 files changed, 9 insertions(+), 17 deletions(-)
rename arch/powerpc/platforms/52xx/mpc52xx_gpio.c => drivers/gpio/gpio-mpc5200.c (98%)
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 47ea1be..90f4496 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -55,14 +55,6 @@ config PPC_MPC5200_BUGFIX
It is safe to say 'Y' here
-config PPC_MPC5200_GPIO
- bool "MPC5200 GPIO support"
- depends on PPC_MPC52xx
- select ARCH_REQUIRE_GPIOLIB
- select GENERIC_GPIO
- help
- Enable gpiolib support for mpc5200 based boards
-
config PPC_MPC5200_LPBFIFO
tristate "MPC5200 LocalPlus bus FIFO driver"
depends on PPC_MPC52xx
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index 2bc8cd0..4e62486 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -14,5 +14,4 @@ ifeq ($(CONFIG_PPC_LITE5200),y)
obj-$(CONFIG_PM) += lite5200_sleep.o lite5200_pm.o
endif
-obj-$(CONFIG_PPC_MPC5200_GPIO) += mpc52xx_gpio.o
obj-$(CONFIG_PPC_MPC5200_LPBFIFO) += mpc52xx_lpbfifo.o
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a4ac78b..47eae6e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -99,6 +99,10 @@ config GPIO_EXYNOS4
def_bool y
depends on CPU_EXYNOS4210
+config GPIO_MPC5200
+ def_bool y
+ depends on PPC_MPC52xx
+
config GPIO_MXC
def_bool y
depends on ARCH_MXC
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index b847fb5..7207112 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o
obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
obj-$(CONFIG_GPIO_MCP23S08) += gpio-mcp23s08.o
obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
+obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
obj-$(CONFIG_PLAT_NOMADIK) += gpio-nomadik.o
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/drivers/gpio/gpio-mpc5200.c
similarity index 98%
rename from arch/powerpc/platforms/52xx/mpc52xx_gpio.c
rename to drivers/gpio/gpio-mpc5200.c
index 1757d1d..9b325dd 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -184,15 +184,13 @@ static int mpc52xx_gpiochip_remove(struct platform_device *ofdev)
}
static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
- {
- .compatible = "fsl,mpc5200-gpio-wkup",
- },
+ { .compatible = "fsl,mpc5200-gpio-wkup", },
{}
};
static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
.driver = {
- .name = "gpio_wkup",
+ .name = "mpc5200-gpio-wkup",
.owner = THIS_MODULE,
.of_match_table = mpc52xx_wkup_gpiochip_match,
},
@@ -341,15 +339,13 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev
}
static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
- {
- .compatible = "fsl,mpc5200-gpio",
- },
+ { .compatible = "fsl,mpc5200-gpio", },
{}
};
static struct platform_driver mpc52xx_simple_gpiochip_driver = {
.driver = {
- .name = "gpio",
+ .name = "gpio-mpc5200",
.owner = THIS_MODULE,
.of_match_table = mpc52xx_simple_gpiochip_match,
},
^ permalink raw reply related
* [PATCH 0/4] Some defconfig updates
From: Anton Blanchard @ 2011-07-06 23:13 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
Here are a few defconfig updates I had lying around in my tree.
Anton
^ permalink raw reply
* [PATCH 1/4] powerpc: Sync pseries and ppc64 defconfigs
From: Anton Blanchard @ 2011-07-06 23:13 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <20110706231313.260037641@samba.org>
The pseries defconfig had a number of drivers enabled and we may
as well add them to the ppc64 defconfig.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: linux-powerpc/arch/powerpc/configs/ppc64_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/ppc64_defconfig 2011-07-05 15:05:59.903893167 +1000
+++ linux-powerpc/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:26.482898262 +1000
@@ -176,12 +176,18 @@ CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
CONFIG_SCSI_IBMVSCSI=y
CONFIG_SCSI_IBMVFC=m
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
CONFIG_SCSI_IPR=y
CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
CONFIG_ATA=y
CONFIG_SATA_SIL24=y
@@ -235,11 +241,13 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
CONFIG_E1000=y
CONFIG_E1000E=y
CONFIG_TIGON3=y
+CONFIG_BNX2=m
CONFIG_SPIDER_NET=m
CONFIG_GELIC_NET=m
CONFIG_GELIC_WIRELESS=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
CONFIG_EHEA=m
CONFIG_IXGBE=m
CONFIG_IXGB=m
@@ -248,6 +256,8 @@ CONFIG_MYRI10GE=m
CONFIG_NETXEN_NIC=m
CONFIG_PASEMI_MAC=y
CONFIG_MLX4_EN=m
+CONFIG_QLGE=m
+CONFIG_BE2NET=m
CONFIG_ISERIES_VETH=m
CONFIG_PPP=m
CONFIG_PPP_ASYNC=m
@@ -330,6 +340,8 @@ CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_EHCA=m
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
CONFIG_MLX4_INFINIBAND=m
CONFIG_INFINIBAND_IPOIB=m
CONFIG_INFINIBAND_IPOIB_CM=y
^ permalink raw reply
* [PATCH 2/4] powerpc: Disable IRQs off tracer in ppc64 defconfig
From: Anton Blanchard @ 2011-07-06 23:13 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <20110706231313.260037641@samba.org>
The IRQs off tracer enables mcount which has a big impact on
performance. Disable it.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: linux-powerpc/arch/powerpc/configs/ppc64_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:26.482898262 +1000
+++ linux-powerpc/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:29.932959288 +1000
@@ -446,7 +446,6 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
CONFIG_LATENCYTOP=y
CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_IRQSOFF_TRACER=y
CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_DEBUG_STACKOVERFLOW=y
^ permalink raw reply
* [PATCH 3/4] powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
From: Anton Blanchard @ 2011-07-06 23:13 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <20110706231313.260037641@samba.org>
Add mpt2sas driver to pseries and ppc64 defconfig.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: linux-powerpc/arch/powerpc/configs/ppc64_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:29.932959288 +1000
+++ linux-powerpc/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:31.242982461 +1000
@@ -181,6 +181,7 @@ CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_BE2ISCSI=m
+CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_IBMVSCSI=y
CONFIG_SCSI_IBMVFC=m
CONFIG_SCSI_SYM53C8XX_2=y
Index: linux-powerpc/arch/powerpc/configs/pseries_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/pseries_defconfig 2011-07-05 14:23:08.098773438 +1000
+++ linux-powerpc/arch/powerpc/configs/pseries_defconfig 2011-07-07 09:07:31.242982461 +1000
@@ -149,6 +149,7 @@ CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_BE2ISCSI=m
+CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_IBMVSCSI=y
CONFIG_SCSI_IBMVFC=m
CONFIG_SCSI_SYM53C8XX_2=y
^ permalink raw reply
* [PATCH 4/4] powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
From: Anton Blanchard @ 2011-07-06 23:13 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <20110706231313.260037641@samba.org>
As a result of changes to Kconfig files, we no longer enable
the lockup and hung task detectors. Both are very light weight
and provide useful information in the event of a hang, so
reenable them.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: linux-powerpc/arch/powerpc/configs/ppc64_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:31.242982461 +1000
+++ linux-powerpc/arch/powerpc/configs/ppc64_defconfig 2011-07-07 09:07:32.693008109 +1000
@@ -443,6 +443,8 @@ CONFIG_NLS_KOI8_U=m
CONFIG_CRC_T10DIF=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEBUG_MUTEXES=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
CONFIG_LATENCYTOP=y
Index: linux-powerpc/arch/powerpc/configs/pseries_defconfig
===================================================================
--- linux-powerpc.orig/arch/powerpc/configs/pseries_defconfig 2011-07-07 09:07:31.242982461 +1000
+++ linux-powerpc/arch/powerpc/configs/pseries_defconfig 2011-07-07 09:07:32.693008109 +1000
@@ -321,6 +321,8 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_CRC_T10DIF=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_DETECT_HUNG_TASK=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
CONFIG_LATENCYTOP=y
CONFIG_SYSCTL_SYSCALL_CHECK=y
^ permalink raw reply
* {PATCH] Firmware update using the update_flash -f <filename> results to soft lockup BUG
From: divya @ 2011-07-07 5:27 UTC (permalink / raw)
To: linuxppc-dev
Cc: antonb, naveedaus, kenistoj, chavez, arunbal, srikar, jlarrew,
lxie, mahesh.salgaonkar, Subrata Modak, suzukikp
Hi ,
Problem Description:
Firmware update using the update_flash -f<filename> results to soft lockup
BUG
FLASH: preparing saved firmware image for flash
FLASH: flash image is 50141296 bytes
FLASH: performing flash and reboot
FLASH: this will take several minutes. Do not power off!
BUG: soft lockup - CPU#1 stuck for 67s! [events/1:36]
Steps to reproduce:
1. Check the firmware information on the machine (using ASM or lsmcode)
2. Update the system firmware with the update_flash command
update_flash -f 01FL350_039_038.img
info: Temporary side will be updated with a newer or
identical image
Projected Flash Update Results:
Current T Image: FL350_039
Current P Image: FL350_039
New T Image: FL350_039
New P Image: FL350_039
Flash image ready...rebooting the system...
Broadcast message from root@abc
(/dev/hvc0) at 5:25 ...
The system is going down for reboot NOW!
[root@abc /]# Stopping rhsmcertd[ OK ]
Stopping atd: [ OK ]
Stopping cups: [ OK ]
Stopping abrt daemon: [ OK ]
Stopping sshd: [ OK ]
Shutting down postfix: [ OK ]
Stopping rtas_errd (platform error handling) daemon: [ OK ]
Stopping crond: [ OK ]
Stopping automount: [ OK ]
Stopping HAL daemon: [ OK ]
Stopping iprdump: [ OK ]
Killing mdmonitor: [ OK ]]
Stopping system message bus: [ OK ]
Stopping rpcbind: [ OK ]
Stopping auditd: [ OK ]
Shutting down interface eth0: [ OK ]
Shutting down loopback interface: [ OK ]
ip6tables: Flushing firewall rules: [ OK ]
ip6tables: Setting chains to policy ACCEPT: filter [ OK ]
ip6tables: Unloading modules: [ OK ]
iptables: Flushing firewall rules: [ OK ]
iptables: Setting chains to policy ACCEPT: filter [ OK ]
iptables: Unloading modules: [ OK ]
Sending all processes the TERM signal... [ OK ]
Sending all processes the KILL signal... [ OK ]
Saving random seed: [ OK ]
Turning off swap: [ OK ]
Turning off quotas: [ OK ]
Unmounting pipe file systems: [ OK ]
Unmounting file systems: [ OK ]
init: Re-executing /sbin/init
Please stand by while rebooting the system...
Restarting system.
FLASH: preparing saved firmware image for flash
FLASH: flash image is 50141296 bytes
FLASH: performing flash and reboot
FLASH: this will take several minutes. Do not power off!
BUG: soft lockup - CPU#1 stuck for 67s! [events/1:36]
This is solved by the following patch
--- arch/powerpc/kernel/setup-common.c.orig 2011-07-01 22:41:12.952507971 -0400
+++ arch/powerpc/kernel/setup-common.c 2011-07-01 22:48:31.182507915 -0400
@@ -109,11 +109,12 @@ void machine_shutdown(void)
void machine_restart(char *cmd)
{
machine_shutdown();
- if (ppc_md.restart)
- ppc_md.restart(cmd);
#ifdef CONFIG_SMP
- smp_send_stop();
+ smp_send_stop();
#endif
+ if (ppc_md.restart)
+ ppc_md.restart(cmd);
+
printk(KERN_EMERG "System Halted, OK to turn off power\n");
local_irq_disable();
while (1) ;
Thanks
Divya
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox